From: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue, 21 Jul 2020 14:33:04 +0000 (+0200)
Subject: popupMenu: Handle keypress if numlock is enabled
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~684^2^2~95
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=26e66aa4fdbf04e01ff973629c9647b059a838fd;p=gnome-shell.git

popupMenu: Handle keypress if numlock is enabled

On Wayland, navigating menus with the keyboard would not open drop-down
menus when NumLock is enabled.

That's old issue (gnome-shell#550) that was not completely fixed with
commit 88556226 because the lock mask needs to be filtered out in
_onKeyPress() as well.

Closes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/550
---

diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index ad827ac5b..222dbe9c4 100644
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -881,9 +881,10 @@ var PopupMenu = class extends PopupMenuBase {
 
         let state = event.get_state();
 
-        // if user has a modifier down (except capslock)
+        // if user has a modifier down (except capslock and numlock)
         // then don't handle the key press here
         state &= ~Clutter.ModifierType.LOCK_MASK;
+        state &= ~Clutter.ModifierType.MOD2_MASK;
         state &= Clutter.ModifierType.MODIFIER_MASK;
 
         if (state)